<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
<<<<<<< HEAD
    <h1>1111111111111111</h1>
    <h2>222222222222222222</h2>
    增加主分支功能
=======
    <h1>qqqqqqq</h1>
    <h2>aaaa</h2>
    修改错误
>>>>>>> bugFix
</body>
</html>